Enterprise Version
Try to fix an exception when adjusting